Remove gdk/gdkx.h

It was just a kludge.

diff --git a/gdk/gdkx.h b/gdk/gdkx.h
deleted file mode 100644 (file)
index edb7a54..0000000
--- a/gdk/gdkx.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-/* This is a kludge to be able to include gdk/gdkx.h from inside the
- * GTK source tree.
- * Also, this hopefully serves as a warning to new backends to put
- * their header into the backend dir from the start.
- */
-
-#include <gdk/x11/gdkx.h>

diff --git a/gtk/gtkapplication-x11.c b/gtk/gtkapplication-x11.c
index 8c52be849033ecd086e041993e65d137f81db3f7..0d93f3c2c12a1ee557db24c953c245826cfe3d00 100644 (file)
--- a/gtk/gtkapplication-x11.c
+++ b/gtk/gtkapplication-x11.c
@@ -22,7 +22,7 @@
 
 #include "gtkapplicationprivate.h"
 
-#include <gdk/gdkx.h>
+#include <gdk/x11/gdkx.h>
 
 typedef GtkApplicationImplDBusClass GtkApplicationImplX11Class;
 

diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c
index ce3accb6172af5f7968e37f2d6da837918532672..0c2c41681be62026eef98a75bbe05c9ab36ca55c 100644 (file)
--- a/gtk/gtkimcontextsimple.c
+++ b/gtk/gtkimcontextsimple.c
@@ -20,7 +20,7 @@
 #include <gdk/gdk.h>
 
 #ifdef GDK_WINDOWING_X11
-#include <gdk/gdkx.h>
+#include <gdk/x11/gdkx.h>
 #endif
 #ifdef GDK_WINDOWING_WAYLAND
 #include <wayland/gdkwayland.h>

diff --git a/testsuite/gtk/objects-finalize.c b/testsuite/gtk/objects-finalize.c
index 26b0362885385c6216e7b78dd9dba5ccb5c31ab3..90b5045badce33263ac533e1542804fef49fe924 100644 (file)
--- a/testsuite/gtk/objects-finalize.c
+++ b/testsuite/gtk/objects-finalize.c
@@ -20,7 +20,7 @@
 #include <string.h>
 
 #ifdef GDK_WINDOWING_X11
-# include <gdk/gdkx.h>
+# include <gdk/x11/gdkx.h>
 #endif
 
 

diff --git a/testsuite/gtk/window.c b/testsuite/gtk/window.c
index 055841011d445c87b713034f2acc4a3b7015dba9..ba289f2446121a8e46c5ecdc397134423e88c9b1 100644 (file)
--- a/testsuite/gtk/window.c
+++ b/testsuite/gtk/window.c
@@ -1,7 +1,7 @@
 #include <gtk/gtk.h>
 
 #ifdef GDK_WINDOWING_X11
-#include <gdk/gdkx.h>
+#include <gdk/x11/gdkx.h>
 #include <X11/Xatom.h>
 #endif